Merge from emacs-24; up to r107994
authorChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 12:05:11 +0000 (20:05 +0800)
committerChong Yidong <cyd@gnu.org>
Mon, 14 May 2012 12:05:11 +0000 (20:05 +0800)

Trivial merge